Ensure watchdog remains disabled unless enabled on the command line.
authorIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Fri, 13 Jan 2006 14:09:39 +0000 (14:09 +0000)
committerIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Fri, 13 Jan 2006 14:09:39 +0000 (14:09 +0000)
commit8ffaf9c238e61a5e435cf648f86f8ece042b8db9
tree7e1615fe28be13da88ecc8c1d6ba3ecf7cd6894f
parentdd38458519384dff33252ae76889e08d5dbe7a18
Ensure watchdog remains disabled unless enabled on the command line.

Bail out of setup_apic_nmi_watchdog() early if watchdog is not
enabled. Is the watchdog is disabled then increment
watchdog_disable_count to prevent it ever becoming enabled.

Unconditionally call setup_apic_nmi_watchdog() from setup_local_APIC()
so that the above is guaranteed to have occurred before the first call
of watchdog_enable().

Signed-off-by: Ian Campbell <Ian.Campbell@XenSource.com>
xen/arch/x86/apic.c
xen/arch/x86/nmi.c